Resolves merge conflicts issues