pretty code
merging