fixed merge conflict in view