some changes
changes
conflict resolved