ignore intellij idea files and resolve conflict
renamed a constant