Merge pull request #2543 from nabinhait/fix1

FG item and raw material can not be merged