more merge fixes

Signed-off-by: Jake Whatley <jacob.whatley91@gmail.com>