Remaining conflict files cleaned up manually

Files could not be opened in the web interface

Packages/vr.teachr.interactables/Runtime/Blackboard/Models/Materials/Green_Board_Dif.mat.meta

 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: d4f334490f5485a4a8e29ef33501cce7
-=======
-guid: 675f5e41fd891c34a8e01528e85e9e3f
->>>>>>> master
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

Packages/vr.teachr.interactables/Runtime/Projectiles/Prefabs/Projectiles/Apple Variant.prefab.meta

 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/own/Interactables/Throwables/Prefabs/Projectiles/Apple Variant.prefab.meta
 guid: 880bb25513ae419489e0cd3114adfad0
-========
-guid: 8e043dbac0a8c6d44baa5556aa36d954
->>>>>>>> rwth-development:Assets/own/Interactables/Throwables/Prefabs/Projectiles/InkCartridge Variant.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: 

Packages/vr.teachr.interactables/Runtime/Projectiles/Prefabs/Projectiles/InkCartridge Variant.prefab.meta

 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/own/Interactables/Throwables/Prefabs/Projectiles/InkCartridge Variant.prefab.meta
 guid: 8e043dbac0a8c6d44baa5556aa36d954
-========
-guid: 880bb25513ae419489e0cd3114adfad0
->>>>>>>> rwth-development:Assets/own/Interactables/Throwables/Prefabs/Projectiles/Apple Variant.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: