removed comment lines, intentional merge conflict unsuccessful