local changes
commiting after resolving conflicts
added comment functionality