fix merge conflict by sync'ing version