Remove accidentally commited merge backup files