Fix conflict in terms page