Resolved merge errors (i hope)