Fix Merge Conflict

A merge conflict was present in this file. I've assumed you want the version that was in the HEAD.