[CK] Fixed regexp to handle merge conmits properly.