change fileendodings
fix conflict