Debugging stuffs
Resolved conflicts