Updating afer resolving merge conflict