First upload of cleaned merge