Fixed more coflict stuff