updated gitignore
and views
git cached cleaned and updated
resloved merge conflict