first
ingores..
change1 brach2
changes1 by branch1
change3by branch2
Merge branch 'branch1' into branch2

Conflicts:
	mera/src/com/mera/CreateRestrictionsImpex.java
Merge branch 'branch2'

Conflicts:
	mera/.gitignore
	mera/src/com/mera/CreateImpex.java
	mera/store_impex_template.impex