completed full merge