Fixing merge
Dealing with merge -_-