I had the same issues as this guy, did everything (except some steps, like deleting anti viruses), and his solution in the end of: starting windows in safe mode, allowed me to merge the respective file.
I had the same issues as this guy, did everything (except some steps, like deleting anti viruses), and his solution in the end of: starting windows in safe mode, allowed me to merge the respective file.