Fixed some stupid version control errors (i bad)