Fixed remaining merge conflicts and JSHint errors.