Fixed Merge Bugs +Silly Patrol Bug