Conflicts Resolved !!!