fiksa conflict i functions.cpp