I think I have fixed the merge conflicts Joseph, please double check at your convience