Resolved auto-merge