getting ready for spring break working
conflict resolved