fiax after merge