Makefile.am merge=ours
Makefile.in merge=ours
