Fixing merge problem

Fixing merge issue with prototype.unity