fallback to parabolic to merge with master