Fixed some merge stuff and some other stuff