Leo's mod replaces several functions where the Bugfix mod attempts to modify lines, thus the line numbers are wrong if the Bugfix is applied second. Applying Leo's mod after the Bugfix mod should safely resolve all conflicts, though it will undo a couple fixes.
The following files have conflicts: outside.gd, joblist.gd, and enchantments.gd. Only the conflicting bugfixs to outside.gd are significant, as those improve the handling of removed slaves. Part of your change to joblist.gd has the same result as the bugfix, and the bugfix's change to enchantments.gd is not important.