add me
fix conflict between partner and me