resolve merge conflict 04/02/13 cinquo