Ensure views are disposing plus manual merge