I agree, it needs git style (or even Ms word style) conflict resolution. hopefully they will figure this out soon