Weird ass double stuff
Resolved merge conflict
Fix double stuff