Removing merge error in tile-script
merge fixed?
Merged Fixing
Signed-off-by: ScottHenwood <schenwood@live.com>