fix merge errors
fix janky merge issue commit
more merge fix