Initial merge feature implementation