Local changes & Merge Except xml