resolve conflict on readme