ok I think I fixed this merge thing