MERGE
Fixes merge issues
Fix merge