merging branches with assignments (October 12th 2014)