This came in as part of the rebase with master. When there was the conflict with this file I used the ``git checkout --theirs <filename>`` command and continued with the rebase. I am willing to update this code as needed but I unfortunately don't know what you are taking about, please elaborate what change specifically need to be made. Thanks.