Update Makefile.am

Fix missing line ending in merge conflict resolution