new line
Issue solved
Conflict resolve