commit cleaing
cleaned
conflict resolved