some change
confilict resolved