import hasConflicted & bug fixed