Fixed rebase issue in developer guide

Change-Id: I9ddc6b6009a83e6dd40706f1408781d6fcb81a50