basic completion
place search working
resolved conflict