20141003 - Merging first before continuing synch-up