merge code and comments