resolve merge conflict

diff --cc modules/language/python/compile.scm
Simple merge

diff --cc modules/oop/pf-objects.scm
index 125a3f79924fa048b5f48e4a0066911f1303c422,0f583268231d45b0fa8fed4462de89b1edaa3b07..d0ba6e44858b511427ac6be9c24fe599d28feb78
--- 1/modules/oop/pf-objects.scm
--- 2/modules/oop/pf-objects.scm
+++ b/modules/oop/pf-objects.scm
@@@ -2,8 -2,7 +2,9 @@@
    #:use-module (oop goops)
    #:use-module (ice-9 vlist)
    #:use-module (ice-9 match)
 +  #:use-module (system base message)
 +  #:use-module (language python guilemod)
+   #:use-module (ice-9 pretty-print)
    #:use-module (logic guile-log persistance)
    #:replace (equal?)  
    #:export (set ref make-p <p> <py> <pf> <pyf> <property>