Fix merge derps

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