file adsl.xls modified
resolve conflict