added "HOWTO resolve merge conflict"