Ignoring dumb css foldr
Merge conflict
Really ignoring css/
Merge conflict :(
Merge conflict on output folder again :/