changes to the cms page
resolved conflicts