cleaning up jade merges