updated todo
merged conflict