add more comments
merging