Fixing conflict in view.