Added check for conflict module and approve reservation module.
merged-jom-modules