merge after stash
added questune in the view
pull master branch and resolve the  conflicts