yet some conflicts
@@ -66,11 +66,7 @@ def test_fill_map_counts_hpx(events):
axis_det = MapAxis([-2, 1, 5], node_type='edge', name='detx', unit='deg')
# This test to check entries without units in eventlist table do not fail
-<<<<<<< HEAD
axis_evt = MapAxis((0, 100000, 150000), node_type='edge', name='event_id')
-=======
- axis_evt = MapAxis((0, 100000, 150000), node_type='edge', name='event_id', unit='')
->>>>>>> Added check on energy axis name following predefined conventions and added test with multiple energy axis names
geom = HpxGeom(256, coordsys='GAL', axes=[axis_evt, axis_det])
