Fixed merge conflict by going with Patrick's version.