fixed buggy add/remove venue behaviour
Fixed merge conflicts