remove remnants of merge conflict