change version number
resolve conflict