fixed merge problems in views