Removed committed conflict