resolves merge issue