fixed some merge stuff