xml
conflict resolution 1998
changed files/folders names and structure