Hypothesis added, basic assumptions are made
merge-conflict solved