ng edit
Hook acronate into front
Conflict fixed