I love when a little forethought saves me headaches at merge time.