merged conflicts pt. 2
merge conflicts pt.3