tried to format comments and failed, they show up though
fixed merge conflict