Debugged
Solved conflicts