fixing the merge for real now
refacotring