commit before merge
merge
update todo