test conflict
resolve conflict commit