conflicts  terminal  y
