Merge conflicts resolved Pt. 2