Added Integration tests for conflicts