Fixed conflict with Activity Plus