Solved wrong merges