fg
resolved conflict