resolving merge
Fixing the finally block
Adding in the finally blocks
resolving merge conflict
killed the pinacolata
cleared everything