Fixed two conflicts that i missed. Everything is working well now.