catch compile error from bad merge