fix bad conflict/replace generation

yop, still not fixed ...... The reformatting can add extra spaces. You can try my version on https://github.com/ros-naoqi/naoqi_bridge-release.git