resolve conlict + add new file