remove trivial conflicts: initial commit