A team of 6 people are working on a project using an Agile process that has weekly iterations that start on Monday and end on Sunday. The project is not going well. On Monday, there is a weekly project meeting where the requirements for the new iteration are decided upon and assigned. After the meeting, the 6 programmers download the latest version of the code from Git and start working. Around Friday they finish development and commit their changes. There are often many commit conflicts on Friday and the programmers have to work weekends to resolve all the conflicts and get the system working and tested again. Often one programmer spends a day refactoring several classes only to find out that another programmer had done the same thing for a different requirement. The changes that one programmer made dont function correctly after being committed to the repository on Friday because of changes made from another programmer. During the week programmers will chat online and email code changes and bug fixes to each other.

What would you recommend this team do differently so that the code commits go more smoothly?