adding test
adding test
fixing conflicts