fix merge derps and duplicate attributes

Change-Id: I0821e1b4af195c309082022dea931ffd1e9bef19
Signed-off-by: scott <scott@ubuntu>