Got rekt!
fixed some merge errors