working on list
merged conflicts