Conflicts resolved !!!