a lot of stuff is changed
conflict resolved
merge