Jane and Joe change on master
Blue and Purple change on merge_conflict
merged into master keeping changes to line 3