* fix compilation error (merge issues)