Resolved merge conflicts

Signed-off-by: Aubrey Howell <simplyaubs@gmail.com>