elaborated on the description
resolve conflict