add idea setting via gradle
resolve merge fault