Merge fixes and conflict resolution