fix compilation after merge