added new file to check for conflict
conflict solved