Merge Local changes and clean up