git deleted my changes in some kind of horrible merge :S