In a Scrum team, the developers meet for 15 minutes every morning to discuss: 1) What they did yesterday, 2) What they will do today, and 3) Any blockers. This is called:
Two developers edit the exact same line of the same file and try to merge their changes. Git stops the process and asks for help. This situation is called a: