[rules-dev] osgi pull request conflicts