[filebrowser] some cleanup on bad merge conflict