delete extension .zip
fix conflicts