Mysterious commit
Solving conflicts
still do not know whats going on