Fixed some weird goofup from merge/conflict