Brejcha's solution merge