Feature/simplify merge with 320