Continuation of previous merge

Git, what are you doing ?