update command page
resolve conflict