Finished merge