removed additional public folder
merge conflicts in views