Add Not A NYR post.
Fix merge conflict.