temp work version
solve confliction