Trying to make the commits a single one

Created a new pull request so that the commit can be a single commit.