JBIDE-14810 - error during merge. oops...