pyramid: fix mismerge

Change-Id: If51f1b22c9d27365a18b080876de87cb87f3bf31
shooter: fix mismerge

Change-Id: Ifbe37516550a324a67bb9d71d5d76cd4041117c4
shooterk: fix mismerge

Change-Id: I61086f0246f1ec9ab478f675aa3b0c3c5334c9c8