Resolved conflicts and push