comment added in bugFix branch
had to resolve merge conflict