Finished merge, not tested