Add comment removed when fixing conflict in merge