Fixing git sync issue
fixed
Fixed css stylesheet conflict