just added
conflicts finally resolved