add unit test to check for conflicts