remove bit of merge conflict text