When merging just ignore all changes you did to this file. The cleanup has already been done in develop-branch.