Fixed merge problems

Removed duplicate code at the end of Resources.java