Deleted friendly view change as not to get a confilct merge