modify
commit resource files
commit delete
commit delete
commit
Merge remote-tracking branch 'origin/master'