Do not replay certain conflict editor edits

This pull request refers to trello card https://trello.com/c/09TLUllT
I am not sure whether this approach is the right approach or just an ugly hack to replay changes done in conflict editors, or whether it is complete. What do you guys say?

@caiusb
@MichaelHilton
@altern