Does this need to be resolved before merging?