Fixed user unresolved view merges