fixed some merge conflicts, output correct standard features

Signed-off-by: Chris Jones <chris@jonezy.org>