fixed minor issue with mergin