fixed a merge conflict in a view partial