Resolving conflicts with recent_content