made a change
[issue 53]
fixed the urgent crisis
Merge branch 'iss53'
change
changed the same line
fixed conflict