Updated mose of the views
fixed conflicts