closer to finishing merge