Updated the file to indicate that it was merged into master.