resolving merge conflicts, pushing update