first commit: view layout is very bad, need to be changed. Artificial intelligence is not working properly
resolving conflict