remove additional merge conflict