removed merge conflict remnants