special exceptions for E-F
fixing 3-way merge