fixes quantity changes
fixes merge conflict