EPIC Merge Conflict Fixes