translated comments and added new conflict end