New merge answer

Test this on your computer please!