initail commit
resoving conflict