Resume merge and fix