it wont let me sync ;_;
conflicts and stuff
Merge remote-tracking branch 'origin/master'