commiting to ensure no conflicts