Merging, dont know if conflicts
what the fuck is going on with git commits