Adaptation to go1.4
Fix conflict