Merge bugs, had to go in and change text again.