merge cepass.cpp