Fix merge derps

Change-Id: I9189946115433f21ac10ad2379cb02ac5af5866f
Signed-off-by: Dragon <dragon7780@hotmail.nl>