My contribution
merge conflicts