fix merge of master and detailview + camera