Added some comments
Merged confilts