merge problems

Had conflicts with view-port-sizes and world-sizes. Reverted them to 60
for whoever set them at that.