Fixed merge conflicts -- score of 40 :D