cleaning up
wing files
merging