styles: es6ify
resolve merge conflict