Merged conflict in view.pri