Fixed bug from merging repos