init-lite
Resolve merge conflict.