Final touches on merge