Removed merged code.
Updated gitignore