facebook edits / merge conflicts