Resolving conflicts of previous push