Fixed resources after merge.