clearing up merge conflicts
cleanup deleted files
merging branches
updated styles