testing remote conflict
resolve conflict