v4.15 END_FUNC with return value now
fix conflict