Fixed travis link in readme
fixed merge conflict in readme