fixes on the UI item picking up
fixed merge conflict