fixed typo in solution
ignoring conflicts