Fixed merge conflict
Fixed merge conflict

TobiasFaller/AlgoDat,BackofenLab/AlgoDat,BackofenLab/AlgoDat,TobiasFaller/AlgoDat,TobiasFaller/AlgoDat,TobiasFaller/AlgoDat,BackofenLab/AlgoDat,TobiasFaller/AlgoDat,BackofenLab/AlgoDat,BackofenLab/AlgoDat