xls print enabled
conflict resolved