master. commit with conflict
TASK-42. Task that was used for rebase & squash demonstration