align, refactor
Fix merge