Fixing git conflicts.
Adding pymod.