test arranged
merge conflict fixed