ver1 created
ver2 created
resolve conflict