sync almost working
merge conflict