remove temporary files + fix merge bug
lot of changes