added remove conflicting container option