js update - remove incorrectly backported conflict generator