Fixed merge errors
Fixed merge errors in cue.cpp