Fixed the shit the merge error added
There's no changes but github says there is
Merge remote-tracking branch 'origin/AlexBranch'
Iunno what's going on