Resolving so as to push, merging code