fix Merge Conflict, pep8 format

修复了`Merge Conflict`, 代码格式按照`pep8`整理了下