some deletet comments
merging