resolve merge conflict
added a comment to #132