deleted conflict in file
fixed conflict