That young merge fixing