imporvements to resolve editing differences form for pages still need to add diff