On Shelah's amalgamation