Resolved Merge Conflict

Resolved a random merge conflict in RenderMobObelisk