fixing my shitty code
fixing conflict