init git
fix conflicts
fix the css conflicts