conflict in CMakeLists fixed
conflict in CMakeLists fixed

jackdawjackdaw/emulator,MADAI/MADAIEmulator,jackdawjackdaw/emulator,jackdawjackdaw/emulator,MADAI/MADAIEmulator,MADAI/MADAIEmulator,jackdawjackdaw/emulator,MADAI/MADAIEmulator