create conflict
fix the conflict and commit