Edit conflict - other version:
Test myfunction comment
Edit conflict - your version:
Test myfunction comment
End of edit conflict
Edit conflict - other version:
Test myfunction comment
Edit conflict - your version:
Test myfunction comment
End of edit conflict