Test automatic merge, also bug fix for the sink settings and prepare structures for new features

The main point is to make sure automatic merging is working, or if I should re-fork