Manually merged portions of a pull request for play-time achievements