bugfix category move
performance improvement conflict calculation
bugfix login