Fix idea merging
Merge branch 'master' of github.com:seadlng/seadlng