master. commit w/o conflict
TASK-42. Initial commit
TASK-42. Second commit. New file
TASK-42. Third commit
TASK-42. 4th commit