Calendar next method
Risk with git commit after trying bisect although i don't know what that really do
Conflict solved