Resources replacing, refactoring
Merging