update some version numbers
resolve conflict