fixed auto-merge residual conflicts