removing some commented merge conflicts
removing merge conflicts
fixing conflicts