Solved readme conflict