Fix some merge conflicts and silly mistakes -_-

Change-Id: Ia5f362a95fd3b69ec90389577cc735c0b8b12499