Did some work on resolution. Trying to use egit.