Tweaking merge