remove merges directory from gitignore

Adds merges for Android support