Merges are scary!