Make merges suck less.