commit from 1
confilct solved