New message in main script.
Merge branch 'git_conflicts_step_1' into develop