fix merging with python3