new resource files are added
conflict resolved