commit all changed files before trying merge