Minor improvement
Merge and resolve conflict