Fix harmless edits turning into conflicts
The idea is as follows: It only makes sense to stick to our conflict
resolution view when the previous POST action was done from a conflict
resolution screen. We can detect this via multiple POST parameters. I
decided to use only one. Note the same is already used a few lines above.
SWAT! This must be backported now. :-(