clean up modle conflicts