Litle changes
Merge conflict resolve