merge manual

Before the merge