Fixing Merging again to make sure of the changes from github