working on bfs
appjs merge fix