>>>>>> upstream/develop ======= $lang['contact_info'] = 'Contact Info'; >>>>>>> remotes/upstream/develop // End