resolved hw7 conflicts