add remsub6.py
fix conflict and update