Non-lazy solution would be manually fixing all these conflicts on a text editor but ain't nobody got time for that