possible conflict changes in master
with out add -- commit not possible