Fixed tile layers
Fix merge conflict in nikko's shitty dictionary