?
merged 'cool_branch' with master and resolved conflicts