merge done
finshed merge exercise with error handling