removing todo & correcting the code messed up in conflict