add new file
commit in new branch
method new name
conflict solved