After resolving merge conflicts