Commit conflict local