finishes the assignment
fixed conflict