A couple of Bug Fixes

Fixed activity plus conflict