resolved conflicts with master
Fix some funky merge issues