remove final merge conflict