unbind alt+enter i3 and use java 6
resolve merge conflict