merged todo