delete not needed changes in code
merging 1