resolving conflicts in files