Fixed merge of resoruces.