Add more comments for lines
Fix merge conflicts