finishing merge?