This issue was reported to the AEM engineering team. The solution provided was to add cq.shared dependency on "/etc/clientlibs/foundation/main". Check if this helps. Also I would suggest you to recompile all JSPs, invalidate Cache and rebuild the clientlibs.

This issue was solved through daycare ticket. The issue was at salesforce side and some white-listing was needed to done at their end.

This is due to the OAK behavior which gives you a view on a certain state within the repository, when a change is performed on the repository, the change is performed against this base state and is applied (merged) to the HEAD state.In case the state of the session differs too much from the HEAD state the merge fails, and an OakMerge exception is raised. This is due to other changes happening in the repository, which could affect also the areas where your session wants to perform its changes. Th...

Thanks for your request. I am assuming you are using IMS integration. Could you confirm you AEM version? For AEM 6.5.1, as documented in [2], the customers should follow approach as mentioned in [1]. AEM 6.5.2 onwards customers can choose to use [3]. It seems like you have followed [3] in your AEM 6.5.1 environment.[1] https://docs.adobe.com/content/help/en/experience-manager-65/administering/integration/target.html[2] https://docs.adobe.com/content/help/en/experience-manager-65/administering/in...

Please check : https://docs.adobe.com/content/help/en/experience-manager-65/classic-ui/siteandpage/classic-feature-scaffolding.html