Merge conflict was incorrectly resolved

Fixed the merge conflict