Fixes remaining conflicts