Resolve conflict
Further resolve conflict