Fix for no results in view
Deal with merge conflict