add transfer page
resolve conflict