merge and edits to views