cleaning up library conflicts