commit changes
handler the MasterPage conflicts