committing before the merge