Okay, that should not be here. Can you get rid of the changes in this file, e.g. by simply taking the version from the master and copying it into your branch?