add export to ulapps
fix merge conflict