pulling
fixed merge conflict in readme