Resolve conflict
Fix conflict