edit on original-computer
fix conflict