merging...
many changes: turns out smth was bit with my git, and I comitted to some wrong place for 2 months