Resolve conflict with README