commit all changes
add coding: utf-8
solve conflict with remote partner