added example files
fixed conflict