resolves the merge issue