commit 27 Mar
merge conflicts clarified