README update
Export
 - Conflicts solved