Remove merge-added changes