Merged TODO conflict