Current
Merge fixed