add message from main dev
solve the confliction problem