Fixed a few typos.
removing starts_with() in favor of strpos()
Fix conflicts.
Fix conflicts.