Fix merge fiasco