just added some comments
fixed the stupid conflict that was my fault