renable sync
resolved merge conflict