Fix merging and derping

Change-Id: Id9511a15949d43aa9bae318ef0f7953d5ee7ba49