Issue #216 Fixed coflict markers