some css changes and checking out reverse git options
commiting conflict resolved files