Conflicts fixed and should be all working