file tranfser history
fix conflict