test reset soft
resolve conflicts