Add Allie as author
Fix merge conflict