fix merge conflict in about