Chang view according to new screen shots
removing conflicts