resolved conflict, added comment to text.