Fixed the errors from the merge