resolve the conflicted issues when pull from the github