functionality improvement
Resolved confilt