Conflicts: windows/LibEthereum.vcxproj windows/LibEthereum.vcxproj.filters Solved by removing files (not necessary anymore)