fixing non-fast forward so can pull from Brian
resolving merge issues