Fix merge pb with intelij UI