Scrum
Fixed merge conflict