Resolving conflicts

Yeah sometimes github messes everything up y’know MF