Fix merge conflict in idea json output