added implementation for conflicts