Commit to prevent conflicts