Removed optional automatic commit. Instead, we now always automatically mark the file as merged.