gah missing }. merge fail