You need to solve both the elven and dwarven council member quests (available after you have been to the castle and do something else), before you can solve the conflict between the elves and dwarves.