add file and make changging'
fixed conflicted