Minor stuff for merge conflicts