add a lint to branch
merge branch Ning'sBranch after solving conflicts