Added tile conflict fixing