llowing files would be overwritten by merge:
%%sPlease commit your changes or stash them before you merge.