Feat/dd2 - Resolve merge conflict