Re-fixed error in conflicts for ros-groovy-core.