E0d/fix conflicts