Resolving conflicts in file