sword positioning
merge conflicts