Before merge
Cleared merge