day 3
fixing conflicts