solve conflicts in reset 2 part