I would solve the TODO before merging.