Merging vonflicts and committing the same