Added sync script
Fixed merge conflicts