adding no ff to merging