Repaired pbs_python makefile after git merge conflict