Final commit after conflict resolution