git usage fail. Shameful manual merge...