fixed merge/compile error