Removing comment
fixing heuristic
merging