final version
conflicts merged