merge finished

resources added, accessing tiles