diff --git a/Assets/ML-Agents/Timers/SampleScene_timers.json.meta b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
index 933f257..fcbb12a 100644
--- a/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+++ b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
 guid: 4af2646cae3014146bf467e2830fdb41
 TextScriptImporter:
@@ -10,6 +11,9 @@ DefaultImporter:
 >>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
 =======
 guid: 346e9f2550a219244aeff3bf857e8b41
+=======
+guid: 4d57ab7f0c619e9439665e6de75b5d44
+>>>>>>> 9f8c2c1d8177a6b47862a1b23538206e355848a2
 TextScriptImporter:
 >>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
   externalObjects: {}