fixed merge conflicts in views