fix pylint problem fix conflict fix op list fix check warning fix code based on review comments update akg commit fix check warning