Fix conflicts for push