commit changes in new from my own
changes in new
zmiana teresci
theirs new file
commit z my owna
 resolve collision in new. saved changes from my_own branch