adding Ch3 assignments
fixing conflicts