fixed my shitty merging