Fixed some shit bruh
fixed conflict