try to fix conflicts