corrected merging errors- LG

Signed-off-by: Andrew McKinney <mckinney@neuro.duke.edu>