added comment about me!
merged conflicting commits