another test to see if conflicts cause by magit and rake deploy