a second conflict from another clone
this is my modification from my second clone