Resolve conflict for README.MD