Conflict fixes (1905)
Added css files