added new files
fixed merge coonflicts