change conflict resolution
bump version