merging
merge conflict
small things working