* Finishing merge