12/5/14 got rid of merge conflicted files