Making sure my changes are pushed
Fixed merge conflicts