fic after merge