johns modify
fix conflict