fix unwanted merges