contrib merge