Update /afk and fix error with git merging.