Solved conflicts successfully
Solved conflicts successfully