organizing code
merging