adding make announcement
resolve conflict