fixing osgi conflict