master:
1) Conflicts solved