fix browseview
fix merge conflicts