fixing conflicts
removing .idea files again