Add Sean Tilley
merge conflicts and trailing whitespace