Fixed conflicts on comments