remove merge conflict relict