Changing file to reflect the contents of the file on master