:white_check_mark: Add test case for conflict error handling
:white_check_mark: Add test case for conflict error handling

SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart,SoftInstigate/restheart