Commiting changes
Merge conflicts resolve
Custom taco is damn near done
Merges unconflicted