gke: enhance regexp used to find merge conflicts