v0.2 WIP
resolve conflict