checking conglict on master