adding comment on the head
fixing conflicts