New changelist
delete unnecessary files/dirs
Merge remote-tracking branch 'origin/master'