Prepare file
fixed conflict