Collision fixed
Merged Conflicts