Updated gitignore
Added merge module