- Solved conflicts after pulling from giihub