Fixed merge errors
I can't even merge properly