readded comment lost in merge