develop: compy PEP8
develop comply with PEP8
develop solve a conflict