Fix more wierd merge bugs