Okay, really merged properly this time!