working version
merge conflicts