remove merge conflict markers
update