Just spent 3 hours fixing code because everyone decided to push commits and not handle conflicts properly 🙃