Actually - can you again take the master's version of this file - your branch should not contain any changes in this file.