Remove files variable & 'git commit -a' on merge error