Merge Conflict Fixes