git sucks
[GABI] merge problems pepus