Revert "better solution to id "conflic""

This reverts commit cecbd4e9c0821acc95cd23d159e986567f5729bd.