stylesheet changes on 3rd jan
resolving conflicts