follow-up
resolve conflict