Ignore dis shit
Fixed merge errors