Error Fixes to merges