Merge branch 'my-new-feature' into 'master'

Remove left-over conflict statements from file

Removed merge conflict statements from Modifiers.py.
These had been leftover from the dev merge.

See merge request !221