remove so fix conflict thing from mock, and update config