Fix merge disaster