pre-merge conflict
Conflict resolved
post-merge conflict
removed classspath