Remove a unnecessary file
Merge branch 'syb'