Fix errors and merge from solution