(BUG) Resolved merge conflicts

All merge conflicts resolved.