checkout neocomplete -> master
resolve conflict