Merge again, trying to tackle assignment 1
Fast-forward