removed conflict markers in readme