tracing this encoding bug..
fixed conflict. tip: do not --amend to pushed commits