restoring after merging