Add merging section to developers

Explain merging of changes.

Change-Id: Id2a5456974f925815193b61fb0ba24c170b20ff9
Merge "Add merging section to developers"