Commit after fixing conflicts