Harmonize the order of controls

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Enlarge Deleted merge conflict dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Show commit hashes of conflict file

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>