arbeta
merge conflicts fixed