removed conflict markers in readme

cleaned up the read me of conflict markers