Fixed any errors that were from rebase