resolution of merge conflict in complaint.js