Fixed conflicts

Logan look at the FirstUse and make sure everything is still there