new changes
conflicts resolved