update new view
complete merge