Fix merge derps

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