merge manually