all done merged perfect