Fix bug with incorrect git merge call when $OPTS is empty. Refactor variable names to upper case.