Resolve conflict with previous version