changes
merge conflicts are fixed