views merge fixes