resolving conflicts
Conflicts:
merge markets and header