merging

merging codes