added headers
resolved conflict