removing traces of manual merge