Fixed merge conflict sorta