integration testing
fixed pull conflicts