AddShowingView modified
conflicts resolved