conflict residuals fixed agter merge