Merge notes need to be resolved/removed.