Some uncommited changes i forgot :(
fixed the conflict