Work on the ores
Fix merge