clash 2nd file
fixed conflict