Commiting before pull
oh god tried merging