seans commit. this will create a conflict
adding candidate data after resolving conflict.