(fix) Fix merge conflicts in css and took out logs