Update tilesets and collision levels take 2

This should fix the merge errors of the origional