merge: bugfix: compile error