Fixed deadline on integration tests
Resolving conflict