6
conflicts resolved