solve staff conflict and style check #118

Closed LI-XINYI1 closed 2 years ago