Update merging to include brief implementation details