added tile_x, tiley_y attribute and initializer in the constructor
fixed merge conflicts, added both