Fix Merge and missing derp

Change-Id: I62b40a407bad6c115813f16179d5578a8afa0a1c