For merge
Resolved conflict