Added tests for conflicts.