resolve conflict in about file