organizing the specs
merging changes