Fixed remaning merge issues
Fixed remaning merge issues

Tim-Sobolev/pefile,erocarrera/pefile,sebdraven/pefile,viper-framework/pefile,ShingYang/pefile,pombredanne/pefile,sebtoun/pefile,viper-framework/pefile