Resolve remaining merge markers