friday night commit
Saturday morning commit
Resolving merge conflicts