update sales mgr
fix conflicts