fixed loading resource after renaming
resolved merge conflict