Adding export
merging