Fixed Merging Errors

Fixed some errors caused by GitHub when merging the two commits.