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