removed a couple reduntant styles from merge

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>