added conflicts packages to app and monitor control files