edit stock details
conflit resolved