added new integration test
resolved conflict