Cleanup last merge