Merge conflict solved yay