latest changes
merge conflict solved