for git skill <<<<<<< HEAD

======= first commit por test

pro