Resolution of merge conflict in main.