What situation can occur when attempting to combine branches containing changes to the same piece of code?
lost code
automatic override
merge conflict
collisions