algoritmer
merged conflict