still problems with merge phase