the merging aftermath
not really in a good state but committing to be safe