solved conflict in readme