merge in organisations-fixing work