This line is from desktop
resolve conflict