Resolved merge conflicts! Deleted all shit. It's compiling again....