Resolve conflicts on previous push