resolve conflicts in Resources