fixed conflict
fixed the superfluous conflict markers in file