resolved conflict :-)