Solved Cookie error
Resolved conflicts
Buggy sector commented