new terms of service
resolve merge conflicts