Code style modification mixed by wroking on rebase/merge?